Remove unused test code
Merge pull request #1403 from djmitche/reomve-unused-test-code

Remove unused test code