ops, still messing around a bit, slightly adapting the tests...