Divide the extension into separate classes
Tweak the tests