Fixed invalid method names.
Fixed tests.