Redesign to reuse test cases
Merge pull request #10 from richardsantos/dev

Redesign to reuse test cases