updated db declarations to match schema

removed two attributes, updated output from tests