Fix blatant error
Clean up test sections, and introduce better terminology