Cleaned up test structure.