376 - Fixing tests spec
Merge remote-tracking branch 'origin/master'