Use assertCount instead of assertEquals with php function count
Assertion organization improvements
Call container as argument in services
Added ContainerAwareInterface
Added ContainerAwareTrait and tests