test-case improved, more coverage, etc.