cleaned up some test code