Fixed regexs and added tests for leading zeros