Made the old unit tests pass