Tweak restricted labelling
Fix tests for restricted labelling

I am a bad person who did not run the tests before committing
7567ba4d29fbe7758c27357bc43bd6ec5a80dc69.