modified so that all tests can run