[project import] fix previous patch and related tests

Authored by sgerlach on Jan 6 2019, 3:52 PM.