Fixed tests so that they aren't dumb