Gradually restored some tests