require-dev PHPUnit, adjust tests for type hint, misc other changes