revert r679221, the mock constructs form a part of the test cases and removing them changes the behaviour