unittest + 2 userfile checks
Merge pull request #1 from ssz225/master

unittest + 2 userfile checks