updated tests, passing