Tests and utils
Merge pull request #2 from SkylarKelty/feature/util

Tests and utils