Cleaned up some test code and moved some things