removed unused methodes, added test