Cleaned up test code