cleanup
PHPUnit unit tests, minor changes