refactored phpunit loading
Fixing tests according to latest barberry version