Fix sporadic test failures
Move from fest to assertj