more bashtest fixes

Change-Id: Ie6851d14b3aabd5ae21ffcbb571fbcc461b42b82