Changes to tests to make them less depedent on LSF configuration