Rework some tests