Fix test organisation host and base