Fixes broken unit tests from adding prefixes.
Merge pull request #21 from sbartlett/master

Fixes broken unit tests from adding prefixes.