patching up tests and passing them