Add important check in a remote test case
Remove commented out code from tests