Make tests more clear and replace screen shots
Merge remote-tracking branch 'origin/master'