Working on database modeul and test tool