Additional fixes for unit test data locations

Authored by cordlandwehr on Oct 5 2019, 10:43 AM.