Upgrade assertj-core to 1.7.0 and assertj-guava to 1.3.0