Fix autotests 

Fix verify size disks. Code refactoring.