Forgot to update tests on rename.
Clean up unused init function.
Be more robust.