Move tests coverage. Remove psr3 trait.
More tests coverage