Refactoring Part 8 done. Tests are incompletete for controller(...) method