Instead of testing for an error condition with an if-statements and then explicitly calling `fail()`, use the Truth library's `assert_()` method. Also remove a couple of unnecessary `final` modifiers. Change-Id: I523768cc48254b1bac0d5b70478309075dd897e7