better atmosphere type definitions and tests