site controller specs, add own saving folder for tests, new factories
Merge remote-tracking branch 'origin/master'