add FacadeBridge
refactor test