Adds Bind/Include test and corresponding fixes.