Improve compose tests.