Fixed test to work on Windows

Close the database before removing it, remove it using a more
Pythonesque mechanism, and renamed the variables to be more clear about
their function
Fixed test to work on Windows

as de60a57
Fixed test to work on Windows

Close the database before removing it, remove the file using a more
Pythonesque mechanism, change "echo" statement to be more Pythonesque.