Fixing approval tests