Done:
	Test for controllers
	Refactoring of controllers