correct naming and organize test a bit
Merge remote-tracking branch 'origin/master'