finished most of remaining todos in tests