Make the deriving tests work. Cvs: ----------------------------------------------------------------------