Cleaned up test code.