Add more testing cases