Fixed parameter for rebuild_test_database
Shortened some table names