Extend the multi-atom unit test