Fixed panic.
Changed timeout tests so they don't fail.