Revert "Trimmed the branch to only the test_osm sub directory"

This reverts commit 6fdcaa2e03933bb1289f793a5b0b13a1d0f49d30.
Rebase from 'upstream'
Trimmed the branch to only the test_osm sub directory