Change a few tests