Reorganize for pester test