Feature/issue 1058 makefile bug

#### Summary:

Fixes the makefile so repeated builds work.

#### Intended Effect:

There was an issue with a `-include` call inside the tests. This has been addressed.

#### How to Verify:

Build a test. Then merge a branch. Then build the tests again.

#### Side Effects:

Fixes a build bug.

#### Documentation:

No changes to expected behavior.

#### Reviewer Suggestions:

Anyone.