Fixed #201 failling tests
Merge branch '201_Tests'