ECDR-46: Added test for ECDR-63 and improved other tests.