Tests; three; rename for newer format, tidy fov test slightly for adding code test