Cleaned up tests a bit and added stderr and stdout tests
JUnit tests improved a bit again