Adjust some test logic