Improve VOMP testing