Fixes & tidies up tests.