Merge "New test cases for quota tests suite"