With updates to the sample xml, made updates to the functional tests so all tests pass
Merge branch 'tests' into dev