Fix automatic impot for user exposed API
fix test