make phpunit run locally
Revert "fix a few bugs"

This reverts commit 7c54be6a13898258802dbb59ab53e520f082b024.
fix broke tests