Fixed tests after implementing VIR-6. They all pass now.