Re-organized the tests

BUG=
R=sigmund@google.com

Review URL: https://chromiumcodereview.appspot.com//17772002