Update Units + tests