Updated test_database to make independent.

Changes in __init__.py caused the test_database unittest suite to
stop working.