separate the different types of verification so they are logically
separate and can be reused separate of each other.
Signed-off-by: NJohn Johansen <john.johansen@canonical.com>