fixed failing tests, sum up all changes to merge to origin/cfse-1.1