Updated tests some to account for things that have changed since they were written.