change import way and add unittest