Added some unit test stuff