[ Chris Talbot ]
  * Reorganize tests
  * Use modem interface by default