Bug 868: Removed test code-duplicated from MD-SAL