DatabaseTests fixed