Testfixes

Removal of dead code and obsolete test cases

@junmendoza @pboyer PTAL