Added additional tests for DB support and modified some for interface changes