more tests, and psr-4 compliant