Slight changes to test