Fix code arrangement
Add a testing, code coverage: 81%