Merge pull request #226 from metti/test_fixes

Add diagnostic make file targets