Also improved relevant tests for modifiers to be more strict and detect if the modifier body was skipped.