Formatting json, adding test and moving images