alignment
udpate test db
refactor