New tests and some fixes

- Improved indentation
- Add more tests
- Some fixes
- code_coverage_script.sh modified