database issues fixed for testing