Try and fix tests some more