Merge "Remove deprecated alias of test decorators (2/2)"