TestAtom fix
Merge origin/master