Update atomic and add some test