Fixing problems in test package
All test package fixed