Merge "Merge "Fixed tests that were broken due to a bad merge." into pie-cts-dev am: 2b43a7174f"