Merge "Move test decorators to common"