Cleaned up tests for DDC-2775