Rename tests more appropriately