re-add phpunit
improve UI
improve UI