switch to extension style and fix the tests to match