fixed some bugs
Merge pull request #14 from Kris-Simpson/tests_export

Fixed some bugs