wjchen - modify database test conflict