change tables around, to account for virtualmachine_templates and
instances
redoing tests