Massivly improved autoTest
More improvements