Move to build_port_bindings(). Added Tests