db design update, forms renamed, tests fixed

Change-Id: I8664f0f1b8a3eadeb1f110c4be5209aef393807b