reorganize unit tests per phpunit suggestion