Roll back faces; fix underscores; add harder tests