Updated directory/test names to reflect appropriate platforms