Various minor changes. Changed test database name