integrated EventFilter into BarrierSpec

test still fails, but I think it's because we need TestFSMRef to be
pulled in
fixed failing BarrierSpec test and added ControllerSpec