Fixed unit tests with invalid metadata versions
Merge remote-tracking branch 'origin/master' into dev-nmalik