Cleaning up unit tests for faster development in future