[FIX] Correct line counting when removing lines and add some null checks
[IMR] Add remove feature test cases
Merge branch 'feature/standalone'
Merge branch 'master' of github.com:tmarwen/wise-utils