Added some test code
Clean up