Update Unit Test on Site Controller & Cleanup

Remove Skywalker & Old Test