Merge changes to Units to test with Compute()

2 jobs for dev-add_compute
in 24 seconds, using 0 compute credits, and was queued for 7 minutes and 8 seconds