refactor extensions placement, fix tests