Refactor to be way more reliable
Updated the expectation with comments