some fixes some breaks in tests