Merge pull request #360 from tkolhar/master

Added test for ID 194305
template class for filtered package consumption
removed unnecessary teardown, added more comments
Merge pull request #361 from hhovsepy/master

added new template class