Removed some unused methods and added more tests