Fix for test imports