Missing constants & malformed tests
Merge remote-tracking branch 'origin/master' into travis-ci