- Splitted methods to meaningful tests - Added tests for additional functionality - Covered missing parts