wip cleanig up broken tests