Some cleaning in tests