Upgrade AssertJ to version 1.7.0 and use AssertJ for Guava