Tweak naming and add more tests.