Removed unnecessary if statemet
All tests are working now!
Merge branch 'dev'