Updated helper, guardfile, and tests