fix unit tests - wip