fix #122 - updated test_portrait.py to deal with new directory structure for json files