yet another new structure for the unittests. finally starts to make
sense