New test for 'Vapiano'.
Fixed conflicts.