Removed unused method and added some more tests