bundle test, extension refactoring