make assertThat public
use hamcrest test syntax
remove old assert