Start fixing up tests (long way to go!)