Minor cleanup of test suites in MD-SAL