minor
fix stream wrapper,
fix URL paths
drop stream wrapping as unused
make static
code-style
more tests added,
need to avoid System.exit call from TestNG test-application