finally fixed the current tests – I suppose