renamed test cases, rewrote test script