RT | #2034 | making more changes to numeric tests