Tests: Fix composite tests