TESTS - Change a few Database Tests