Merge "Change quota tests to use assertEqual"