Update to HEAD tests
Chnged to use GetOp instead & added error + checking