Fix tests so that they are easier to read