Fix mvc tests