Some fixes 3
minimum change for tests