Fix test/devel and add vic and swim