Minor tests and additions.