Tests are failing after merging to main

[ayogasekaram]

All tests and check in branch with approval but fails after merging to main.

[shajoezhu]

Please check, if this is still problematic @ayogasekaram @edelarua , thanks guys!

[edelarua]

Tests are no longer failing after merge commit #168 on July 7.