Removed unused method.
Renamed method, added tests.