Added additional tests; removed obsolete implementation of the CompositeBarrier.