refactored test structures to read better