tidy lenses and tests