revision and expansion of test suite
revision and expansion of test suite