Move workspace creation to test