Merge "Removed Old*Test for integers and longs"