#JC-1454 Add Tests