Small cleanup, test improvements
Merge pull request #19 from EugenyLoy/cleanup

Small cleanup, test improvements