Added unittest component type for PHPUnit tests
Reorganized unit tests