added "some" phpunit tests, cleanup