More clean test Output

- More clean test Output
- Minor fixes