Change current db version test and some variable names