Minor changes for make check and test timeout