require entire framework
fix test bootstrap
refactoring