cleaned up test
cleaned up and simplified test + code