Several changes to Atmosphere
- Improve unit tests.
- Improve several method names