Revert 201202

Breaks cmake configure of new unit tests directory