Adding in some tests with assertj