Fixing problems in test package