extending timeouts for tests, and fixing config on linux
merging..