convert more tests to assertj