Housekeeping only
Housekeeping only
Housekeeping, again
Added helpers for testing Atom types. Housekeeping