added a unit test that tests for x_Method, xMethod... correctness; fixed several subsequent bugs