Fix or ignore tests