Added further test cases. Added matcher for visibility bridge.