updated to include more expect statements