#9 in process

- clean test cases;
- clean code in process.