break apart tests
 clean up test syntax