Database entity table renaming
Cleanup in Database Initialisation and Testing