unit test fix for #3052 and #3053

No star imports :)