Move test_unit integration code to fix warnings.
Merge pull request #250 from phiggins/move_test_unit_code_to_fix_warnings

Move test_unit integration code to fix warnings.