Cleaning up unit tests