Changed container getters to be more explicit. Added unit tests for getters.