use assertj-core 1.6.0 + minor additions