all tests now passing...