Change couple of assertions to assertThat() for readability (& personal preference!)