Fail early in Assert::assertThat (less nesting)
Correct @throws Tag and Add @return