Reword/Rewrite test blocks for simplicity, clarity