Convert anonymous classes to lambdas. Typo fixes. Migrate test to AssertJ. Original pull request: #526.