Fixing test imports