Fix the tests. Fix the case special form