fixing new macro syntax
adding copy of testdata directory when test is enabled