Additional numeric tests - and a fix for double/int conversion