FIX: non-passing tests on COMPOSE.