Cleaned up some test code.