Acceptance tests

Fixes #315.
I find this use of `pop` a little confusing. It might be clearer to use `zip` to join the sorted list of nodes and the list of units....assuming you're confident of the order of each.