Temporary changes for score-tests.