Fixed a number of atom test failures.

2 files changed