added detailed log for tests
Finish detailed-log
vi swp exception added
Merge branch 'origin/dev'