tests should now run on travis, some changes to swdi