Reorganize Atom enum.
Add unzerialize unit test.