Update tests and split up HTTP connections further