Fixed a few bugs in tests