Added #includes to make unit tests match refactoring.
Merge pull request #319 from myshkin/restruct_tests_2

More fixes for unit tests