First massive refactoring: bus is more kind of a bus
Changed test name