require the proper file in the tests
Merge branch 'issue21'
fix the tests
Merge branch 'issue21'