All tests working and passing