Fixed a couple tests