first commit
modified utils logic, add test data