Modifications to test suite.Continuing to write new tests to support base code.