Housekeeping: Superfluous PHPUnit annotations removed.
Housekeeping: PSR2 code style issues fixed