Also check number of values on BuiltStatements (JAVA-515).
Update test to reflect changes in cluster init (JAVA-522).