Progress on fixing autotesting