Added fuller test suite.