All tests now running correctly