Tweak some text, refactor tests