Finished multi-input support. Added test resolver infrastructure.