Improve tests so Aimee can't cheat.
commit