US17: Adding initial granulation of test file.
US17: Updating for US14 changes
Merge remote-tracking branch 'origin/feature-us17' into projectdev