changes to support skipping tests