Did review functionality before tests. I am a bad man