add private methods for common assertions

Dunno if you want this... anyway. Several test cases check that the 'OK', and/or the 'remove' data both validate. I've just pulled the logic out into private methods to keep things DRY.

Signed-off-by: Joshua Paling <joshua.paling@gmail.com>