Added some test stuff