some fixes to the tests, on my slow laptop