Remove extraneous files and get better coverage from testlib & test
Clean up test case a little
Merge branch 'master' of https://github.com/badvision/lawless-legends