Improved lock out on running tests. Added weak work-around for issue with preclean