Convention test tweaks and addition