adding tests
Merge branch 'part04'