Fix test suite
Merge pull request #7 from jtapia/2-2-stable

Fix test suite