Tests replaced.
Old things removed.