Added more bug tests