refactoring the Unit tests for better PHPUnit and PSR-0 support