Making test scripts compliant with new, non-directory changing regime