Fixed Database Tests