change some phpunit tests / remove some phpunit tests.
solution is good but to complex.
@todo we should implement the removed tests