Address CR.
dbs array
Fix up test designations a bit.