Fixing spiro tests