Fix some errors and update packages for UnitTesting