Fix failing conditional creation tests