Cleanup and tests of quotas form