refactor
+ additional test logging
fix exception filtering