Made unit tests pass again