rework some more unit tests