Addresses failing quota int-tests

Refactored tests following comments
Needed to update tearDown method

Change-Id: I2ae65a01f32b7a7afe779d8b54c019c033ac4889
Fixes: bug #1155317