Added some test code and moved some images