General refactoring
Added phpunit task
Some refactoring...