Added test for both fault conditions and fixed the broken activity composition