Fixed #22979 -- Moved bug* tests