Trigger regression

Also contains some coverage changes I forgot to add.