initial code from php-fig repository
fixes tests
remove "Class" suffix in class names
remove trailing whitespaces