fix conditional ddl assertions and restrict one test to 2.1+