Fix tests - All tests are passing