Properly keep track of GRS sources in tests