Update validation methods in Tests
Added org.hamcrest