switch to assertj
Merge pull request #428 from adriancole/assertj

switch to assertj