Added container rules to annotations, more tests