Merge "Fix cts tests to go with atoms clean up" into pi-dev