Wiring up test suite
merge master