s4-test: added greater control over tests to run