Kept the tests in place for the backwards compatibility shim

I have also updated the spec_helper to support both platforms and modified the tests to make them more succinct by removing the separate plaform suites and the identical resource definitions