Armour remaining tests against 5.6.2