Little fixes post-refactor
Extension tests and fixes