Sa 1552 populate tests

[kmoorehead-jc]

Bringing older branch back up in-line with current branch so I can use it to test.