correct method names, add additional testcases