Tweaks; test/pcmdi subdir removed

Remove pcmdi subdir from test path