Replaced assertThat with assertEquals