Fixed test properly
Fixed kill functions
Merge branch 'develop' into feature/tests
Removed deprecated main controller test
Added new tests in base view spec
Merge branch 'feature/tests' into develop