Fix the canary to work, by using consistent userSize semantics
Test improvements