Fix tests
Merge staging results