Fix MultiLens + tests