fixture on controllers
removed differences between branches. Added configuration env
added more tests
removed unused files
refactoring