#6: Fixups on testing