- some modifications as attempts to fix tests on mac