Added tests
Solved #72
Solved #72