Got rid of function call outside of tests.
Refactored tests. Playing with test function names.