Following a court ruling last year that eliminated a tax penalty on non-residents paying wealth tax in Spain, the Spanish government is now moving to bring rules on the 'millionaire tax' in line.