Using lab and adding missing tests
Merge pull request #13 from wpreul/master

Using lab and adding missing tests