We need to add few unit tests and enforce any pull to pass these unit tests before merging to main brnahc