#38 fix for tests