sanity: integrate changes from #1

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>