Merge "Updated test files to use the RS_KERNEL macro."