Bruch: split the Unit-Tests