Removed unused methods and tests.

Added tests for new methods.