added __all__ list
extented database and consolidation tests