Tests: move a couple more mocks into the classes
    
    Since we actually use these mocks, it's cleaner to do them like
    this.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>