Fixed returns in tests