start fixing tests - wip