Conformance T28, refactor unit tests