added some tests
removed unused method