Better workspace mgmt for tests