Minor changes in tests files

-Added blank line
-Updated resources files for cli tests
-Put resources files to the separate appropriate folders

Change-Id: I42c41393de5dc60c5a8e7f78b7cf1f5a0edbb607