cherry pick 9e980cb96761c6a243514df839b1a9a663fb1d20 from mainline

attempt to fix specs
Merge pull request #7 from Jared-Prime/feature/fix_specs

Fix Test Suite