Enabling test - refs #382
Merge remote branch 'fork/382'