Default predicate to 'cont', remove unnecessary version check
Remove unneeded AR version checking from tests

and clean up