Fixed failing test, made it more stringent, too
Merge branch 'master' into private_requests