Rewriting tests to pass after Firebase refactor.