Fix tests to match updated defs.
Set up test requirements. Put install requirements into separate list.