Sanitizing dependencies, minor test corrections