Strip spaces from agency names
Make topic vars in tests local