Adding more options to the lookup context and tests for colletion views