Fix dedupe bug introduced in last commit. Reset valid flag when resetting dedupe context. Cleanup test suites. Do not abort test suite on failure of a test case.