Tweaks to T&C and comments tests