Removed unused method; added tests