Moved inside the function so its re-evaluated for every testcase.
Removed unused method.
More tests.
Merge remote-tracking branch 'origin/master'