Fixing test failures
Merge pull request #465 from ambiata/topic/fix

Fixing test failures
Fixing imports
Fork in Tests
Adding resolver
Merge pull request #452 from ambiata/topic/fork

Fork in Tests
ramble.
versions
fiels
bletch
Brute force. Not pretty.
Brute force. Not pretty.
tests.
code org
tests.
tests.
tests.
tests.
tests.
codecs>