Checkpoint before merging
Changed svs tests