Fixed some issues with tests on certain machines