Fix future import bug, add key tests