Adjust tests to security-manager API changes