Made tests pass again