Adjust some tests