Fixed dodgy tests