fix tests yet again...