Merge pull request #236 from wfrench/platform_integration

Platform integration - Remove Broken Tests