Remove admin.inc, fix bulk update tests