Fixing some lib. references that should not be in the tests anymore