Fixed model-View numbers conversion. Though tests still failing.