AutomTests: minor fixes

Minor fixes to automtests