clean up test case 7 with Jerone's additions