All tests added and passing