Multiple fixes after Test2