All tests now working