Merge "Updating the constrains for the Barometer test-suite"