! rename and update tests for phpunit
! more updates to bootstrap