Several changes

Among other things this update changes my testing workflow