Move test config to central spot
Remove yeild to self on config