Adding forwarding and many-selectors tests, various bug fixes.