Added container and association models and some tests.