tags done and add some test