Worked on EventBarrier together; created test structure
Fixed merge?