Added abstract node to workaround phpunit pb. ther minor fixes