NOJIRA Clean out obsolete test data (and fix test bug) before starting on CLC-1451
Merge pull request #856 from raydavis/raywip

NOJIRA Clean out obsolete test data (and fix test bug)