Renaming classes, added ContainerAware trait, more tests