Moved bundle tests
Moved definition handling to package