Solved some bug and tests written
Merge pull request #2 from aitoroses/master

Solved some bug and tests written