tests fixed (hopefully this time really)