Cleaning up skipped tests (#1846)