Modified packages.configs and UnitTests