Forgot to fix tests. Bad, bad, bad.