Added some test stuff.
Added some other test stuff