Merge pull request #32 from fendor/tdr-test-impls