Rounded off some modifications to the tests