cleaned up unit test a little