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