add a few tests and rename test cases