Removed unused code
Updated DB tests