Removed unnecessary if statements.
100% coverage :)
Merge branch 'dev'