fixing unit tests that were not passing