Fixed DatabaseHandler tests
Merged Katie's branch