#150: Removed old-style method names and updated tests.