Either way a test demonstrating/for 

> sometimes returns the actual table name

is needed, otherwise a future "group not required" type ticket will revert the fix.