Re-organized the tests per platform rather than per type of target