Fixed testsuite

make check passes after commit ba18c37