Improved numeric tests