Test suite integration and minor fixes.