Working on test tool and database module