Removed redundant methods and covered all with tests