Initial test for database specific methods along with refactoring and incorportation