fix phpunit tests and moving forward