Some corrections as tests alter the database