Fixed failing test, made it more stringent, too