Fixing AtomMapTest, removing old tests.