Continue to add tests for existing functionality

(to prevent regressions).