I now have a single function rather than 4 individual functions. The code is cleaner, and I've added it to the unit test. Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>