Improving tests

Improving tests (adding test cases, formatting source code, enhance output).