Fixed some database test issues
Moved the batch files