Fixed testward setup, removed VISTA> dependency