changed order of tests, added longer timeout for deploy