Fixing Spiro Tests