Fixed the database construction problem.  The database must be created
with both tables (always) and destroyed with both tables (always)