LPS-51465 - Add an explicit 'test.dir' where needed for running 'test-class' and 'test-method'