Rewritten some test, changed atom design, a few small changes
Rewritten some test, a few small changes