[HG] Adding some tests for the helpers and cleaning up the test folder.