Rename and break out platform features into discrete tests
Merge pull request #2040 from pmorie/dev/mock_cuke

Break out extended mock tests