Replaced deprecated junit.framework.Assert.* with junit.Assert.assertThat