Converted Testprivate to use Catch, removed type parameterised tests.
Merge branch 'catch' into next