Fixed the breaking build and updated overage tests.