Test case created for Atom. Fixed some Atom issues