checkin of missed files
staging of deleteions
Merge pull request #121 from wseyler/dev

Fix of yesterdays pull request.
No working changes to the test
Merge pull request #122 from wseyler/dev

fixed test compilation errors