Improve completion test cases

This is an attempt to improve the tests for completion so that it better provides what a user would expect to see as correct variants for completion in the cases indicated by the tests.