Remove failure from being necessary and add a few more tests.