make variables more explictand add simple tests
Merge pull request #20 from wangell/clearer_lyza_code

make variables more explictand add simple tests