Added meaningful failure messages and fixed test failures
Merge remote-tracking branch 'origin/master'