Merge "Follow up on building tests for both platforms"