Updated a few tests