Making a bunch of tests pass