Update test suite to be more comprehensive.