Refactored bundle routing
Added translations
Added some manager tests