Cleaned database upgrade tests from 1.9.7 to use ExpectedException