adapt tests because of issue 17