tests: reorganized CallCountTest
tests: added new test cases to CallCountTest
tests: reorganized ReturnTest
tests: added new test cases in ReturnTest suite