done with tests on unrefactored code