Don't use comp. wrappers anymore.
correct order of params
Merge pull request #1679 from dereuromark/master-cleanup-tests

Don't use comp. wrappers anymore.