Added some tests for the helper methods too