Slight bump to startup timeout for build server.
Fixed unit test that has been intermittently failing for DAYS. Derp.