JJ: fixing test
JJ: fixed more tests
JJ: all test with compose c running