removed unused methods, added tests