Cleaned up the unit test