Cleaning up unit test a bit