Slight changes to MouseTest