Modified a few tests