Refactored database tests to match refactored database methods.