Fixed borken tests