Add support code and additional tests.