Added test_id search in the methods that needed it.