Fix up remainder of the tests