Add tests to remediation suite and patched old tests