This should fix all tests, although coverage isn't quite there yet.