Add more bug cases