subsequent refactorings, enhancements, test cases, etc. [bulk commit]