Changes before the meeting
Fixes to meet what we discuss in the  meeting
Fixed the last methods about the metadata's integration tests
Merge with origin/Master
Fixes for the merge