Slight changes in unit-tests