All tests now passing