Cleaned up tests, organized them by device type and OS.