Add more scenarios of acceptance test again