Fixed import for deprecated Hamcrest matcher
Removed unused methods