Supports lab 3 and increase test coverage
Merge pull request #21 from wpreul/master

Supports lab 3 and increase test coverage