fix bug with apev2 save
fix a test setup
fix another test setup
more test fixes