Lots more tests (and they work!)