Added more tests.
Added compose test.