[CLEANUP] - Refactored tests for better readability
- Started using hamcrest matchers for unit tests