#151 improving UT for #120 and fixing some missing imports