more test cases
change naming conventions