fixing tests to pass