Restore test classes

Restore test classes accidentally deleted and ignored in c43fd04f3e.