new unit test + bug fix