more composite tests (almost 100% coverage now)