Ensure Server is Started in Shell Tests

Changed timeouts to more closely align with current (infinite) behavior