fix unit tests more to come