added controller actions to controller tests
Merge remote-tracking branch 'origin/beta' into beta
fixing broken tests
fixed a lot of broken tests and deprecation warnings