Fixed issue #3005 even if test case is missing
Fixed compilation problem by restoring class import (no wildcards)