WIP - rework some tests