Sites remove & Test refactor