Merge branch 'vici-pytest'