basic formatting, added missing (stubbed) tests, trying to get passing now that Ive got firewall access to cert env