Polish up unit test