Merge "Revert "Check feature availability before running tests""