Fixed a few tests