Revert "Improves setup manager implementations"

This reverts commit 40261c5d4832172ac08c57e1b25370a0d19edc14.
Merge pull request #747 from nsendetzky/2014-08-12_setup-test

Reverte setup manager improvements as they causes random problems in unit tests