Replace 'on' with 'once' in a few tests