Extend pod coverage, start work on supporting 5.18

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>