psr-4, cleanup & more tests