unit test stuff added