Replacing with Hamcrest asserts for readability