All tests fixed. New specs added. Also fixed exclusive branching.