removed deprecated method
corected test templates
corrected tests
corrected tests
Merge branch 'feature/remove-global-state' into develop