Expand/improve tests.