cleaned up AtomicTest, again