Improve tests so Aimee can't cheat.
bump
Warmup done