numeric types fixes
tests fix for windows