functional: various updates

Update to accommodate multiple UnitStates
Add a simple functional test for global units