Start adding tests for the helper methods