Working on unit-tests. Some working for controller.