mock site refactor