Add skip condition for <2.1 NuoDB versions and minor test fix