Converted Testprivate to use Catch, removed type parameterised tests.