fix services configuration argument broken from bundle move; fix phpunit config