Bugfix in test environment
Merge branch 'develop' of https://github.com/UnifiedViews/Core into develop