Adding atom + tests