Fix the regular/light switch. Refactor tests.

Commit ea7cca8 introduced a bug preventing $_eris from ever taking
the value "light".