Added self hosting to functional tests for more coverage

#2175