wrote tests
Merge branch 'jv'