Merge pull request #1962 from squaresurf/d2ae1d1d7fdc4b8a21369a25487c2c42e5a496bf

Refactored Unit_test in order to remove redundant code.