autosample handling, test updates