Minor changes in test package