Refactor site tests generator/sample