Some fixes for fat test

some fixes
Fixed

more