Added support for 4
Added a smarter test for single digits