all tests now pass