cj: file added
cj: write test to file
Merge branch 'feature'