Added Ajax timeout / Fix tests