Added Atom parser and more tests