Made slight progress in implementing test suite.