Completion of content assist test and refactoring work