getting utest to pass
minor fixes