Wrote some unit tests
Merge branch 'master' of github.com:SAMdroid-apps/shfr