Adjust tests a little to make them more flexible