Small changes in tests