took out env test in all tests and added eq op