Added more tests and started to incorporated more regions beyond NA