Minor changes in tests format