Removed obsolete class and fixed Unit Test.
Ran CodeFormatting for PSR-2 on the whole project.