major reorg of testing dirs
back to plain old phpunit for unit tests