Fix dependencies.
Extensions to common packages for testing
Little cleanup of tests and dependencies.