phpunit with carlo's fix