merged, changed tests