simplify over-complex mvcp-driver

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
fix tests for simplified mvcp driver

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>