Adding federation tests and tweaking config