Slight changes in tests