Merge pull request #3 from cobertura/master

Pull in changes.
Revert "Replace some System.out for calls to log4j"

This reverts commit db1a19fd2ba9631bb2b41b9cfce57d242f929b74.
Fix all junits
Merge pull request #14 from christ66/master

Fix failing test units.