Migrated context test case to new structure