Revert the affected system tests

SOAP-1845 ALL CAPS