all tests now passing