Reverted work-in-progress changes for the "next gen" MockCreator; instead of releasing it with 0.2 it will have to wait util version 0.3 (changes however still exists in the 0.3 branch).