cleaned, changed tests