Expand tests, fix intersection operation.